From: Happy-melon <happy-melon@users.mediawiki.org>
Date: Thu, 3 Mar 2011 21:40:14 +0000 (+0000)
Subject: Optionally disable including mediawiki.legacy (wikibits.js) module.
X-Git-Tag: 1.31.0-rc.0~31668
X-Git-Url: http://git.cyclocoop.org/%7D%7Cconcat%7B?a=commitdiff_plain;h=1b39e95b1750d66edf1f1f45a035a0fe677fdfa7;p=lhc%2Fweb%2Fwiklou.git

Optionally disable including mediawiki.legacy (wikibits.js) module.
---

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 31f1f939dd..01ae9f330b 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -2499,6 +2499,12 @@ $wgResourceLoaderUseESI = false;
  */
 $wgResourceLoaderMinifyJSVerticalSpace = false;
 
+/**
+ * Whether to include the mediawiki.legacy JS library (old wikibits.js), and its
+ * dependencies
+ */
+$wgIncludeLegacyJavaScript = true;
+
 /** @} */ # End of resource loader settings }
 
 
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 7f343b4b69..fc90f2fc2f 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -1788,7 +1788,11 @@ class OutputPage {
 		$sk = $wgUser->getSkin();
 
 		// Add base resources
-		$this->addModules( array( 'mediawiki.legacy.wikibits', 'mediawiki.util' ) );
+		$this->addModules( 'mediawiki.util' );
+		global $wgIncludeLegacyJavaScript;
+		if( $wgIncludeLegacyJavaScript ){
+			$this->addModules( 'mediawiki.legacy.wikibits' );
+		}
 
 		// Add various resources if required
 		if ( $wgUseAjax ) {